Set the cursor in all cases. If no grab cursor specified, use the grabbing

2004-02-02  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
	in all cases. If no grab cursor specified, use the grabbing
	window's cursor. If the grabbing window has no cursor, use the
	default arrow cursor. (#118025)

diff --git a/ChangeLog b/ChangeLog
index 3bcbbc1f2f99a4cc24e4cf181abb0fd570c14a26..59d145c36ad9c256d067d09effbe0534f0177ddd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-02  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
+       in all cases. If no grab cursor specified, use the grabbing
+       window's cursor. If the grabbing window has no cursor, use the
+       default arrow cursor. (#118025)
+
 Mon Feb  2 22:05:36 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3bcbbc1f2f99a4cc24e4cf181abb0fd570c14a26..59d145c36ad9c256d067d09effbe0534f0177ddd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-02-02  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
+       in all cases. If no grab cursor specified, use the grabbing
+       window's cursor. If the grabbing window has no cursor, use the
+       default arrow cursor. (#118025)
+
 Mon Feb  2 22:05:36 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3bcbbc1f2f99a4cc24e4cf181abb0fd570c14a26..59d145c36ad9c256d067d09effbe0534f0177ddd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2004-02-02  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
+       in all cases. If no grab cursor specified, use the grabbing
+       window's cursor. If the grabbing window has no cursor, use the
+       default arrow cursor. (#118025)
+
 Mon Feb  2 22:05:36 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3bcbbc1f2f99a4cc24e4cf181abb0fd570c14a26..59d145c36ad9c256d067d09effbe0534f0177ddd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-02-02  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
+       in all cases. If no grab cursor specified, use the grabbing
+       window's cursor. If the grabbing window has no cursor, use the
+       default arrow cursor. (#118025)
+
 Mon Feb  2 22:05:36 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3bcbbc1f2f99a4cc24e4cf181abb0fd570c14a26..59d145c36ad9c256d067d09effbe0534f0177ddd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-02-02  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
+       in all cases. If no grab cursor specified, use the grabbing
+       window's cursor. If the grabbing window has no cursor, use the
+       default arrow cursor. (#118025)
+
 Mon Feb  2 22:05:36 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index b0582110ade49495b18330223a5de61063be9aa9..bfa82da8f3452e52cc87405e1ba9d798385e631f 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -560,6 +560,7 @@ gdk_pointer_grab (GdkWindow    *window,
   
   if (return_val == GDK_GRAB_SUCCESS)
     {
+      GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
       p_grab_window = window;
 
       if (p_grab_cursor != NULL)
@@ -573,6 +574,10 @@ gdk_pointer_grab (GdkWindow    *window,
 
       if (p_grab_cursor != NULL)
        SetCursor (p_grab_cursor);
+      else if (impl->hcursor != NULL)
+       SetCursor (impl->hcursor);
+      else
+       SetCursor (LoadCursor (NULL, IDC_ARROW));
 
       if (confine_to != NULL)
        {